bitkeeper revision 1.1159.212.103 (420609f1fbTBjl9ynLuVLkWWeqTOag)
authorkaf24@viper.(none) <kaf24@viper.(none)>
Sun, 6 Feb 2005 12:13:37 +0000 (12:13 +0000)
committerkaf24@viper.(none) <kaf24@viper.(none)>
Sun, 6 Feb 2005 12:13:37 +0000 (12:13 +0000)
commitf4106bcd030b1d32263b66ac9eeafa05a07c534f
treef2491188d6b5163f00c03e6bd7841538caafc1aa
parent6a689ef21d21559d38463e2c192d352e92d6608a
parentc0d41e43157bca272cc2f18e59ff02730898a1f9
bitkeeper revision 1.1159.212.103 (420609f1fbTBjl9ynLuVLkWWeqTOag)

Merge viper.(none):/home/kaf24/xen-2.0-testing.bk
into viper.(none):/home/kaf24/xen-unstable.bk
xen/Makefile
xen/arch/x86/Makefile
xen/arch/x86/pci-pc.c